Auto merge of #5274 - klnusbaum:epoch_5214, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 2 Apr 2018 17:53:03 +0000 (17:53 +0000)
committerbors <bors@rust-lang.org>
Mon, 2 Apr 2018 17:53:03 +0000 (17:53 +0000)
commit551f6f31ae42d0cbc208b681ea516bc36abdb09f
treed44e5fca2285dd839e15f3b2bfc4dcf8525f65a8
parent85671e737a0b390ae7d78249947b499b5aa9fa65
parent3bbe93cef61ca3fcbaf1eb0b5b86bc7d5c25eb3a
Auto merge of #5274 - klnusbaum:epoch_5214, r=alexcrichton

rename epoch to edition

Per issue #5214 let's rename all instances of epoch to Edition